From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 1 Jul 2011 19:44:50 +0000 (+0100)
Subject: x86: remove unnecessary ALIGN directives
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10080
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=cbed78b7be5c4ebeb21f74a73624f922533ff377;p=xen.git

x86: remove unnecessary ALIGN directives

ENTRY() already includes an ALIGN.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S
index c36a9939e1..95faacde86 100644
--- a/xen/arch/x86/x86_32/entry.S
+++ b/xen/arch/x86/x86_32/entry.S
@@ -138,7 +138,6 @@ restore_all_xen:
         addl $4,%esp
         iret
 
-        ALIGN
 ENTRY(hypercall)
         subl $4,%esp
         FIXUP_RING0_GUEST_STACK
@@ -417,7 +416,6 @@ domain_crash_synchronous:
         call  printk
         jmp   __domain_crash_synchronous
 
-        ALIGN
 ENTRY(ret_from_intr)
         GET_CURRENT(%ebx)
         movl  UREGS_eflags(%esp),%eax
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 3b4f12c151..1d952ac2d1 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -12,7 +12,6 @@
 #include <public/xen.h>
 #include <irq_vectors.h>
 
-        ALIGN
 ENTRY(compat_hypercall)
         pushq $0
         movl  $TRAP_syscall,4(%rsp)
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index fa51287a87..943c845560 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -110,7 +110,6 @@ restore_all_xen:
  * the stack, starting with %rip, and an appropriate %ss must be saved into
  * the space left by the trampoline.
  */
-        ALIGN
 ENTRY(syscall_enter)
         sti
         movl  $FLAT_KERNEL_SS,24(%rsp)
@@ -450,7 +449,6 @@ ENTRY(domain_crash_synchronous)
         call  printk
         jmp  __domain_crash_synchronous
 
-        ALIGN
 /* No special register assumptions. */
 ENTRY(ret_from_intr)
         GET_CURRENT(%rbx)